From d085f8c03448a0197b6cf5528293ef9c14c018b9 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 9 Feb 2026 12:01:04 +0100 Subject: [PATCH] Link against the packaged version of libpcre2 Instead of the code copy. Gbp-Pq: Name packaged_libpcre2 --- CMakeLists.txt | 7 +------ src/pcre2/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dddcfb..4134602 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_C_STANDARD 99) -set(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/src/libpcre2/interface) +set(PCRE2_INCLUDE_DIR /usr/include) set(CYTHON_EXTRA_COMPILE_ARGS -DPCRE2_CODE_UNIT_WIDTH=8 -fPIC) # Set PCRE2 options. @@ -15,11 +15,6 @@ set(PCRE2_NEVER_BACKSLASH_C ON CACHE BOOL "" FORCE) # Always make a release build. set(CMAKE_BUILD_TYPE Release) -# Build PCRE2 library as both shared and static. -set(BUILD_STATIC_LIBS ON) -set(BUILD_SHARED_LIBS ON) -add_subdirectory(src/libpcre2) - # Build Cython code as shared. set(BUILD_STATIC_LIBS OFF) set(BUILD_SHARED_LIBS ON) diff --git a/src/pcre2/CMakeLists.txt b/src/pcre2/CMakeLists.txt index 9508aee..4ffd63b 100644 --- a/src/pcre2/CMakeLists.txt +++ b/src/pcre2/CMakeLists.txt @@ -12,7 +12,7 @@ macro(add_pyx_file filename) add_library(${filename} MODULE ${filename}) python_extension_module(${filename}) - target_link_libraries(${filename} pcre2-8-static) + target_link_libraries(${filename} pcre2-8) target_include_directories(${filename} PRIVATE ${PCRE2_INCLUDE_DIR}) target_compile_options(${filename} PRIVATE ${CYTHON_EXTRA_COMPILE_ARGS}) -- 2.30.2